Detect file renames in review diffs by jakeleventhal · Pull Request #3916 · pingdotgg/t3code

jakeleventhal · 2026-07-12T16:36:16Z

Verification

1. File rename with no changes

Git detects one rename and the viewer renders a single exact-original.ts → exact-renamed.ts entry with -0 +0 and no content hunk.

2. File rename with minimal changes

Git detects an 84% similar rename, so the viewer keeps one minimal-original.ts → minimal-renamed.ts entry and renders the -1 +1 content diff.

3. File rename with too many changes

The files are below Git's rename-similarity threshold, so the viewer correctly renders replaced-new.ts as an addition and replaced-original.ts as a deletion.

Summary

enable Git rename detection for working-tree and branch review diffs
include untracked rename destinations through an isolated temporary index without modifying the user's real index
preserve content hunks when a renamed file also has minor edits

Root cause

Working-tree previews generated tracked and untracked patches separately. A normal filesystem rename therefore appeared as an unrelated deletion and addition because Git never saw both paths in the same comparison.

Impact

The diff viewer now renders qualifying file moves as one renamed file while still showing any content changes. Branch comparisons use the same explicit Git rename detection.

Validation

pnpm exec vp test apps/server/src/vcs/GitVcsDriverCore.test.ts (27 tests)
pnpm exec vp check
pnpm exec vp run typecheck
git diff --check

Note

Detect file renames in working-tree and branch-range review diffs

Replaces the two-step working-tree diff (tracked HEAD diff + separate git diff --no-index per untracked file) with a single unified diff via the new readWorkingTreeReviewDiff function in GitVcsDriverCore.ts.
The new function builds a temporary Git index, stages intent-to-add for untracked files, and runs a single patch diff with --find-renames and --minimal against HEAD (or an empty tree when no commits exist yet).
Adds --find-renames to the branch-range diff so committed renames are also detected.
Truncation now reflects a single diff operation rather than concatenated outputs.
Behavioral Change: untracked files, staged index-only deletions, and renames are now included in the working-tree diff; the previous per-file /dev/null diff approach is removed.

^{Macroscope summarized 0fc42d5.}

Note

Medium Risk
Changes how review diff text is produced for the diff viewer (renames, untracked, empty repos, sparse checkout); behavior is covered by new integration tests but could still differ from the old concatenated diffs in edge cases.

Overview
Review working-tree previews no longer merge a tracked git diff HEAD with per-untracked diff --no-index patches. They now go through readWorkingTreeReviewDiff, which copies the repo index into a temp GIT_INDEX_FILE, runs add --intent-to-add -A, and emits one patch diff with --find-renames against HEAD (or an empty tree when there is no commit yet).

Branch-range previews also pass --find-renames on the baseRef...HEAD diff. Truncation follows that single working-tree command instead of OR-ing separate outputs.

Integration tests cover pre-first-commit untracked/staged files, unstaged and committed renames with edits, sparse-checkout scope, and staged index-only deletions.

^{Reviewed by Cursor Bugbot for commit 0fc42d5. Bugbot is set up for automated code reviews on this repo. Configure here.}

coderabbitai · 2026-07-12T16:36:22Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: cdd79e50-375f-4c69-9f54-95cbb6cb7c4e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

macroscopeapp · 2026-07-12T17:09:44Z

Approvability

Verdict: Needs human review

This PR fundamentally changes how working tree review diffs are computed, replacing per-file untracked diff generation with a temporary index-based approach. This is a significant architectural change to core diff logic that affects the review workflow and warrants human review.

^{You can customize Macroscope's approvability policy. Learn more.}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0ac42fc27c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

cursor

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 0fc42d5. Configure here.}

cursor · 2026-07-15T04:09:02Z

+        cwd,
+        ["add", "--intent-to-add", "-A", "--", "."],
+        { env },
+      );


add -A erases index-only changes

High Severity

The readWorkingTreeReviewDiff function's git add --intent-to-add -A command on the temporary index re-adds files that were git rm --cached but still exist in the working tree. This causes the working-tree review diff to incorrectly omit staged deletions and other staged-only index changes.

^{Reviewed by Cursor Bugbot for commit 0fc42d5. Configure here.}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0fc42d53cc

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-07-15T04:16:20Z

+      yield* executeGit(
+        "GitVcsDriver.readWorkingTreeReviewDiff.add",
+        cwd,
+        ["add", "--intent-to-add", "-A", "--", "."],


Preserve non-ignored index-only deletions

Here git add -h says -A adds changes from tracked and untracked files and -N records only the fact a path will be added, so this temp-index refresh no longer preserves an existing index-only deletion when the same path remains as a non-ignored untracked file. Fresh evidence beyond the prior ignored-file case: after git rm --cached f without adding f to .gitignore, this command turns the copied index into DA f, and the following git diff HEAD is empty if the file still matches HEAD (or shows a modification if it changed), whereas the real index represents a deletion to be committed; the review preview can therefore miss or misstate files being untracked.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-07-15T04:16:20Z

+      yield* executeGit(
+        "GitVcsDriver.readWorkingTreeReviewDiff.add",
+        cwd,
+        ["add", "--intent-to-add", "-A", "--", "."],


Keep tracked diffs when untracked repos cannot be added

Because git add -h confirms -A scans untracked files too, this command can fail before the diff is generated for an otherwise valid dirty worktree; for example, an untracked nested Git repository with no commit makes git add --intent-to-add -A -- . exit 128 (does not have a commit checked out). Since the caller converts any readWorkingTreeReviewDiff failure into an empty working-tree preview, the presence of that scratch nested repo hides unrelated tracked modifications that the old tracked git diff HEAD -- path still reported.

Useful? React with 👍 / 👎.

Detect file renames in review diffs

0ac42fc

github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jul 12, 2026

jakeleventhal marked this pull request as ready for review July 12, 2026 17:03

chatgpt-codex-connector Bot reviewed Jul 12, 2026

View reviewed changes

Comment thread apps/server/src/vcs/GitVcsDriverCore.ts Outdated

Comment thread apps/server/src/vcs/GitVcsDriverCore.ts

jakeleventhal added 4 commits July 12, 2026 13:22

Preserve sparse checkout metadata in review diffs

cd85e36

Cover staged index-only review changes

56ae8a6

Include staged files in unborn review diffs

aa8d932

Merge branch 'main' into t3code/detect-file-renames

0fc42d5

cursor Bot reviewed Jul 15, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Jul 15, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Detect file renames in review diffs#3916

Detect file renames in review diffs#3916
jakeleventhal wants to merge 5 commits into
pingdotgg:mainfrom
jakeleventhal:t3code/detect-file-renames

jakeleventhal commented Jul 12, 2026 •

edited by cursor Bot

Loading

Uh oh!

coderabbitai Bot commented Jul 12, 2026 •

edited

Loading

Review skipped

Uh oh!

macroscopeapp Bot commented Jul 12, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Uh oh!

cursor Bot Jul 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Jul 15, 2026

Uh oh!

chatgpt-codex-connector Bot Jul 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

jakeleventhal commented Jul 12, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Verification

1. File rename with no changes

2. File rename with minimal changes

3. File rename with too many changes

Summary

Root cause

Impact

Validation

Detect file renames in working-tree and branch-range review diffs

Uh oh!

coderabbitai Bot commented Jul 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

macroscopeapp Bot commented Jul 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Approvability

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot Jul 15, 2026

Choose a reason for hiding this comment

add -A erases index-only changes

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

jakeleventhal commented Jul 12, 2026 •

edited by cursor Bot

Loading

coderabbitai Bot commented Jul 12, 2026 •

edited

Loading

macroscopeapp Bot commented Jul 12, 2026 •

edited

Loading